Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Испавление путей и местоположения в Locate Textures и Prototypes #197

Merged
merged 15 commits into from
Aug 7, 2024
Merged

Испавление путей и местоположения в Locate Textures и Prototypes #197

merged 15 commits into from
Aug 7, 2024

Conversation

1Stepka1
Copy link
Collaborator

@1Stepka1 1Stepka1 commented Aug 7, 2024 •
edited
Loading

Изменения затрагиваю только папки с нашим контентом а именно:

 Resources\Textures\ADT
 Resources\Prototypes\ADT
 Resources\Locale\ru-RU\ADT

В основном почти все Locale которые не были в prototypes теперь в prototypes
Текстуры рас был нормально распределены в папке Mobs, в основном это коснулось КПБ,Демонов и Драсков
Изменение некоторые названий файлов и папок так как они выглядели странно(упоминания в имени adt хоть в папке adt и т.д) а так же перенос некоторых neзначительных файлов на свои места
Удалено парочку файлов-заполнителей

no cl

@github-actions github-actions bot added Changes: Sprites Изменение спрайтов No C# Changes: Localization Изменение локализации Merge Conflict labels Aug 7, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 7, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 7, 2024 •
edited
Loading

RSI Diff Bot; head commit d92a53f merging into 1ef0284
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:
Edit: diff updated after d92a53f

@1Stepka1 1Stepka1 requested a review from Schrodinger71 August 7, 2024 12:00
@Schrodinger71 Schrodinger71 added this pull request to the merge queue Aug 7, 2024
Merged via the queue into AdventureTimeSS14:master with commit dd11f33 Aug 7, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Schrodinger71 Schrodinger71 Schrodinger71 approved these changes

Assignees
No one assigned
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов No C# Status: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@1Stepka1 @Schrodinger71